From: Glenn Morris <rgm@gnu.org>
Date: Mon, 29 Apr 2019 16:12:53 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~3432
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7c7ee1dd52239ecc3665b7542bd5e0ebc9b74795;p=emacs.git

Merge from origin/emacs-26

c26d452 (origin/emacs-26) * src/macfont.m (macfont_shape): Use conven...
140e7f8 Recommend using font-lock-face over face (Bug#35044)
7cb5364 Check if mouse_face_overlay was deleted (Bug#35273)

# Conflicts:
#	src/macfont.m
---

7c7ee1dd52239ecc3665b7542bd5e0ebc9b74795